bitkeeper revision 1.558 (3fa8bde6eQgIO9tzKu1KolYWJYKnxg)

xen_log.c, hypervisor.h:
  Bug fixes. Minios shoudl work again now.

diff --git a/extras/mini-os/h/hypervisor.h b/extras/mini-os/h/hypervisor.h
index 4c4d752615d919650a406629eef5f16f7e0920b1..3afd245fd6d71ac6d76f1445a792df5a8c704bf0 100644 (file)
--- a/extras/mini-os/h/hypervisor.h
+++ b/extras/mini-os/h/hypervisor.h
@@ -129,7 +129,8 @@ static inline int HYPERVISOR_yield(void)
     int ret;
     __asm__ __volatile__ (
         TRAP_INSTR
-        : "=a" (ret) : "0" (__HYPERVISOR_yield) );
+        : "=a" (ret) : "0" (__HYPERVISOR_sched_op),
+        "b" (SCHEDOP_yield) );
 
     return ret;
 }
@@ -139,7 +140,19 @@ static inline int HYPERVISOR_exit(void)
     int ret;
     __asm__ __volatile__ (
         TRAP_INSTR
-        : "=a" (ret) : "0" (__HYPERVISOR_exit) );
+        : "=a" (ret) : "0" (__HYPERVISOR_sched_op),
+        "b" (SCHEDOP_exit) );
+
+    return ret;
+}
+
+static inline int HYPERVISOR_stop(void)
+{
+    int ret;
+    __asm__ __volatile__ (
+        TRAP_INSTR
+        : "=a" (ret) : "0" (__HYPERVISOR_sched_op),
+        "b" (SCHEDOP_stop) );
 
     return ret;
 }

diff --git a/tools/misc/xen_log.c b/tools/misc/xen_log.c
index 39ed848722229764d8df2e7874768d7706825a2f..a2ecb33021fbae72bb19acad219f2024410d9a82 100644 (file)
--- a/tools/misc/xen_log.c
+++ b/tools/misc/xen_log.c
@@ -1,7 +1,6 @@
 
 #include <netinet/in.h>
 #include <sys/types.h>
-#include <tcpd.h>
 #include <sys/socket.h>
 #include <stdio.h>
 #include <stdlib.h>